Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from orangehrm:master #1

Open
wants to merge 478 commits into
base: master
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Aug 28, 2020

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

@pull pull bot added the ⤵️ pull label Aug 28, 2020
VageeshOrangeHRM and others added 29 commits November 17, 2021 23:10

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* OHRM5X-712: Leave request show past employee tag

* OHRM5X-698: Truncate Leave list last comment

* OHRM5X-690: Show specific time in Leave Request view

* OHRM5X-701: Leave list bulk action model text change

* OHRM5X-702: Leave list action alignment fixes

* OHRM5X-718: Add leave entitlement delete toast message

* OHRM5X-699: Update default filters for my leaves list

* OHRM5X-703: Leave list bulk actions fixes

* OHRM5X-720: Leave entitlement report, Add leave period validation

* OHRM5X-751: Fix leave reports job title filter field

* OHRM5X-639: Leave detailed view change title

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* OHRM5X-663: Refactored Assign Leave screen

* OHRM5X-659: Refactor Leave apply screen, removing duplicated code. updated leaveValidators

* OHRM5X-709: Auto column width report table
* OHRM5X-624: Develop PIM report display fields

* OHRM5X-624: Develop PIM report filter fields

* OHRM5X-624: Develop PIM report listable display fields

* OHRM5X-624: Develop PIM report generic basic display fields

* OHRM5X-624: Refactor report service & dao

* OHRM5X-624: Add core fixtures for unit testing
* OHRM5X-695: PIM - List Employee report, Add report UI

* OHRM5X-732: Search by report id added in filter search params GET ALL API

* OHRM5X-733: PIM - List Employee report screen connect API

* OHRM5X-803: PIM - Save Employee report connect API

* OHRM5X-803: PIM - View Employee report connect API

* OHRM5X-803: PIM - Create Employee report basic FE validations added

Co-authored-by: Vageeshan <vageeshan@orangehrm.com>
* OHRM5X-624: Rename operator sql parts

* OHRM5X-624: Add unit tests for pim reports

* OHRM5X-624: Bump doctrine to 2.10.1

* OHRM5X-803: Add PIM report menu item
* OHRM5X-803: Develop PIM report edit screen

* OHRM5X-731: GET ONE PIM defined API test cases added

* OHRM5X-731: PIM Defined report GET ONE fixtures country entity added

* OHRM5X-803: Develop PIM report edit refactor code

* OHRM5X-766: GET ONE API response gender value pair changes and view report screen prop added

* OHRM5X-803: Add report name to PIM Report view

* OHRM5X-803: Redirect to generate report on PIM report save

* OHRM5X-814: Disable Mobile module activation

* OHRM5X-803: Add custom error message for fields in PIM Report

Co-authored-by: Vageeshan <vageeshan@orangehrm.com>
* OHRM5X-756 - After adding new work shift, loader and navigation back issue fixed.

* OHRM5X-758 - Time Picker interval 15 min added.
* OHRM5X-757- Menu ribbon navigation for Work shift screen is not available issue

* OHRM5X-848 - Menu ribbon navigation for Email Subscription screen is not available issue

* OHRM5X-660/715 - Unauthorized error message display as soon as the supervisor enter the assign leave screen
* OHRM5X-635,OHRM5X-638: Handle past leave period in leave balance API

* OHRM5X-634: Restrict apply/ assign leave beyond allowed range

* OHRM5X-657: Improve overlap leave latest comment to show leave request comment also
SharukaNP and others added 26 commits April 21, 2022 18:57
* OHRM5X-1267: Prevent installer logger write permission failure

* OHRM5X-1267: Allow to access installer/index.php

* OHRM5X-1267: Fix broken paygrade permission issue
* OHRM5X-1278: Update reset password email template format

* OHRM5X-1280: Receiving the reset password email when a valid disabled employee username is entered

* OHRM5X-1281: Improve forgot password screen to work with invalid email configuration
…1243)

* OHRM5X-1271: Improve validation when other email and work email are equal

* OHRM5X-1277: Fix digit checking rule in PIM memberships
* OHRM5X-1284: Move license file to project root

* OHRM5X-1284: Develop installer related APIs

* OHRM5X-1284: Update GPLv2.0 LICENSE

* OHRM5X-1284: Add reinstall & reset installation dev tools

* OHRM5X-1284: Add basic cli installer

* OHRM5X-1284: Clean installer directory
…ing leave & saving timesheet (#1247)

* OHRM5X-1296: Prevent timesheet submission showing error toast

* OHRM5X-1297: Prevent error toast message showing when user applies leave for multiple days by selecting partial days option
…1250)

* OHRM5X-1251, OHRM5X-1257: Send registration data when upgrader started/success

* OHRM5X-1287: Time projects already existing project names can not be added to other customers
…een (#1237)

* OHRM5X-1263: Fix when adding users from admin user management the status is getting saved as disabled

* OHRM5X-1270: Restrict Add button for supervisors in employee list screen
* OHRM5X-1267: "Unexpected error occurred" message is displaying when user serach for employee entitlements without selecting the leave type

* OHRM5X-1267: Current leave period start and end date are not getting displayed by default in filtration fields. 

* OHRM5X-1267: "Invalid parameter" message is displayed when user tries to edit a project name

* OHRM5X-1267: In leave list comments the purged employee is shown as Purge Purge

* OHRM5X-1267: Admin -> Corporate branding is available by default and when user clicks on it it's giving a 404 error 

* OHRM5X-1267: Maintainance -> Purge Records-> Candidate records-> when user click on it its giving a 404 error 

*OHRM5X-1267: Custom fields drop down details are not getting displayed (Text field details are getting displayed as expected)
* OHRM5X-1267: Fix upgrader 4.1/4.1.1 migrations failures

* OHRM5X-1267: Fix corporate branding duplicate entry for primary key

* OHRM5X-1291: Add basic PHP version check

* OHRM5X-1304: Bump max PHP to 8.1 & max mariadb version to 10.7

* OHRM5X-1294: Fix getting error at login screen when sending registration data
* OHRM5X-1289: [Upgrader - Welcome] Warning modal pops up when 'Fresh Installation' is selected

* OHRM5X-1290: [Upgrader - Database Information] UI Issues in the Database Information screen

* OHRM5X-1286: [Upgrader - System Check] System check items should not get repeated with the status
* OHRM5X-781: Develop installer - license acceptance & installation screens

* OHRM5X-1308: Develop installer - instance creation screen

* OHRM5X-1298: Develop installer - clean up install API

* OHRM5X-780: Add unique id generation for employees

* OHRM5X-1310: Add instance identifier to Installer

* OHRM5X-1311: Add required validation to leave type in leave entitlement report

* OHRM5X-1316: Fix time - project activity report broken issue

Co-authored-by: Devishke <devishke@orangehrmlive.com>
Co-authored-by: Rajitha <rajitha@orangehrm.us.com>
Co-authored-by: Sandeepa <sandeepa@orangehrmlive.com>
Co-authored-by: Ajiharan <baskaran@orangehrmlive.com>
* OHRM5X-1240: [Localisation] Punch Out Time Should Be Later Than Punch In Time validation message is not translated

* OHRM5X-1273: [Language] Translate the report headers [PIM,Leave,TIME & Attendance]

* OHRM5X-1285: [Upgrader] Issues identified in upgraded instance with language customization

* OHRM5X-1202: [Localisation] Issues related to localisation in Admin,PIM,Leave,Time & Attendance
* OHRM5X-782: Connected installer data registration BE and FE

* OHRM5X-782: Installer - Send data on installation starts

Co-authored-by: Chamara Abesinghe <chamara@orangehrmlive.com>
…ndling (#1266)

* OHRM5X-1318: Improve installer - database connection error message handling

* OHRM5X-1324: Fix storing multiple events for registration data
* OHRM5X-1320: Check OrangeHRM database user at the installer db config screen

* OHRM5X-1321: Fix redirection issue from installer to application

* OHRM5X-1321: Clear session data installer/upgrader after completion

* OHRM5X-1312: Hide claim menu items

* OHRM5X-1313: Hide LDAP menu item
* OHRM5X-1322: Installer - admin user creation email length validation fix

* OHRM5X-1317: Installer - Installation steps renamed

* OHRM5X-1319: Installer - Licence acceptance remove required text

* OHRM5X-1323: Installer - Organization name length validation fix

* OHRM5X-1319: Installer - DB Config screen style fixes, layout style fixes

* OHRM5X-1299: Upgrader - current version details dropdown required validation fix

* OHRM5X-1319: Installer - Refactor install process, show error message of failure

* OHRM5X-1327: Installer - DB name validations added
* OHRM5X-1329: Fix leave list action buttons alignment

* OHRM5X-1202: FIx German language strings

Co-authored-by: SharukaNP <sharuka@orangehrmlive.com>
* OHRM5X-1328: Allow empty passwords in installer

* OHRM5X-1302: Bump @ohrm/oxd version to 1.0.5

* OHRM5X-1305: Add change log
@RajithaKumara RajithaKumara deleted the branch tralahtek:master July 26, 2022 09:11
@RajithaKumara RajithaKumara deleted the master branch July 26, 2022 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants